From 1bf0390fbd88ab47e2b4f53b572569806d749380 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 21 Sep 2016 15:36:16 -0700 Subject: [PATCH] Move FSFilebackend and MemoryFileBackend to /libs Change-Id: Id38a2ef9e0e22537d0267b536f8a4dfd60c5b41d --- autoload.php | 12 ++++++------ includes/{ => libs}/filebackend/FSFileBackend.php | 2 +- .../{ => libs}/filebackend/MemoryFileBackend.php | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename includes/{ => libs}/filebackend/FSFileBackend.php (99%) rename includes/{ => libs}/filebackend/MemoryFileBackend.php (100%) diff --git a/autoload.php b/autoload.php index f2347380dd..2df7cbb8d6 100644 --- a/autoload.php +++ b/autoload.php @@ -433,11 +433,11 @@ $wgAutoloadLocalClasses = [ 'ExternalStoreMedium' => __DIR__ . '/includes/externalstore/ExternalStoreMedium.php', 'ExternalStoreMwstore' => __DIR__ . '/includes/externalstore/ExternalStoreMwstore.php', 'FSFile' => __DIR__ . '/includes/libs/filebackend/FSFile.php', - 'FSFileBackend' => __DIR__ . '/includes/filebackend/FSFileBackend.php', - 'FSFileBackendDirList' => __DIR__ . '/includes/filebackend/FSFileBackend.php', - 'FSFileBackendFileList' => __DIR__ . '/includes/filebackend/FSFileBackend.php', - 'FSFileBackendList' => __DIR__ . '/includes/filebackend/FSFileBackend.php', - 'FSFileOpHandle' => __DIR__ . '/includes/filebackend/FSFileBackend.php', + 'FSFileBackend' => __DIR__ . '/includes/libs/filebackend/FSFileBackend.php', + 'FSFileBackendDirList' => __DIR__ . '/includes/libs/filebackend/FSFileBackend.php', + 'FSFileBackendFileList' => __DIR__ . '/includes/libs/filebackend/FSFileBackend.php', + 'FSFileBackendList' => __DIR__ . '/includes/libs/filebackend/FSFileBackend.php', + 'FSFileOpHandle' => __DIR__ . '/includes/libs/filebackend/FSFileBackend.php', 'FSLockManager' => __DIR__ . '/includes/libs/lockmanager/FSLockManager.php', 'FSRepo' => __DIR__ . '/includes/filerepo/FSRepo.php', 'FakeAuthTemplate' => __DIR__ . '/includes/specialpage/LoginSignupSpecialPage.php', @@ -924,7 +924,7 @@ $wgAutoloadLocalClasses = [ 'MemcachedPeclBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedPeclBagOStuff.php', 'MemcachedPhpBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedPhpBagOStuff.php', 'MemoizedCallable' => __DIR__ . '/includes/libs/MemoizedCallable.php', - 'MemoryFileBackend' => __DIR__ . '/includes/filebackend/MemoryFileBackend.php', + 'MemoryFileBackend' => __DIR__ . '/includes/libs/filebackend/MemoryFileBackend.php', 'MergeHistory' => __DIR__ . '/includes/MergeHistory.php', 'MergeHistoryPager' => __DIR__ . '/includes/specials/pagers/MergeHistoryPager.php', 'MergeLogFormatter' => __DIR__ . '/includes/logging/MergeLogFormatter.php', diff --git a/includes/filebackend/FSFileBackend.php b/includes/libs/filebackend/FSFileBackend.php similarity index 99% rename from includes/filebackend/FSFileBackend.php rename to includes/libs/filebackend/FSFileBackend.php index ed1b4c00d3..99184e1513 100644 --- a/includes/filebackend/FSFileBackend.php +++ b/includes/libs/filebackend/FSFileBackend.php @@ -27,7 +27,7 @@ * * All "containers" each map to a directory under the backend's base directory. * For backwards-compatibility, some container paths can be set to custom paths. - * The wiki ID will not be used in any custom paths, so this should be avoided. + * The domain ID will not be used in any custom paths, so this should be avoided. * * Having directories with thousands of files will diminish performance. * Sharding can be accomplished by using FileRepo-style hash paths. diff --git a/includes/filebackend/MemoryFileBackend.php b/includes/libs/filebackend/MemoryFileBackend.php similarity index 100% rename from includes/filebackend/MemoryFileBackend.php rename to includes/libs/filebackend/MemoryFileBackend.php -- 2.20.1